Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 17 Jul 2010 10:55:12 +0000 (10:55 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 17 Jul 2010 10:55:12 +0000 (10:55 +0000)
commit2067745cd4748c736724129630b0a245cb2a79ba
treeca36ed2788212abbada6fd20a8c2d3009332c774
parentb333c220f2b1e40bfa3bc5d92bba829b203acbd1
parent587e521f7ab4f6b6911feed0291554e820aaf961
Merge from mainline.